reverted the use of the  boolean, which finally proved to be useless