1/15/14 Final step bugs