Make it a bit less sloppy? :o)