reworked part of actions to async