enhancement 2 changes to meet requirements