268 update based on xdragons combat fork