* started to refactor complete action