Update to match CSSE40480.1