trying to address bugs 4/11/2013