changed generics code paths to 03/