kind of working until jump-phase | redo till monday