Moved assembly to launcher