FIT-147: Update controller