get rid of the boolean