Suggested changes to #383