Changed Controller initiation.