Updated: ActivityController by getting rid of deprecated code