Upgraded for superdevmode