added changes from Michaels forked repo to the repo everyone is working in