Looks better...but still screwed...