merge changes
moving some code