Controller To Be Refactored with Q