progress
rearrange things a bit more