Hoping to send my suggested changes back to David's master