Actions controllers

merge