Removed funky weirdness