update with all the changes from Guard Tour and Fuse