updated assembly loading