More changes to adrian controller