Made changes for compatibility across machines