some changes based on dicussion on 08-04-2014
Updated for hw on 08-04