fixing workflow and messing with states/scenes