Now conforms to modern Mycroft standards

Mostly