separate actions to two files, more fleasible