Actually fix shade
Remove need for magic number