reworking the transitions