Updated with controller