Massive update to Shadowtrax