improved move design
improved move design