Fix request and Move to separate controller