why do we need this boolean at all ? Again, maybe not a change for now but I think this is useless.