New version with controller