Adjusted them to match client requirements