This should be done in an update-step, not in main logic?