Update for Guardsman's updates