Refactoring controller to use better comp filt