master branch updated to mod re-write