took out all boolean