Base controller tweak