preliminary controller changes