Changed former controller part