moved some codes.