Update to be compatible with most recent assignment