Updated with name argument