Updated controller for commonAction