i think this was just superfluous logic ..