1st refactor
changes 6/21/2014