Moved long actions to own functions