updating with Alex changes from 4-21-2013