Screwed something up, better now