Better organized the move effects