Moved preparing to Component