cleaned up controller to match mobile version