changed values to go with database