un-commented some statements that had been commented for testing purposes