move, eliminated more bugs