Updates to controllers

Updates to controllers