just planning stuff
fixed merge