Followed Michael Evans github

Changed Previous Code