added controller update for better flow?