modified action controller and handler