Better alignment of controller