Now using action; other smaller changes as well