Umass branch

Data entry fixed