Updated View Controller for new API