reviewed and accepted all jamie's changes