Screwed things up. Reverting some changes