Feedback Wayne

Processed feedback from Wayne