added set_name method and small change