Converted from forked Repo
Final changes, all working