Update for new system
Merge branch 'master' of https://github.com/hollowaytape/Advance