change current to separate action