modified better select and move
 commit again