Changes as per master Wards suggestions.