code movement. fixed a stupid bug.