move all actions to more suiting place