Controller updates - in development