moved move component to extra function
removed unused init