controller changes for interop (buggy)