Changes added to controller too