Addressed #7, please review