Improved I guess? Thanks to the lovely @Odo :D