In process of incorporating mitch's edits