Tweaked some more
removing hackmakers