changed shape mapping