moved some components