Tweak a little, still crappy