JK edits according to https://www.evernote.com/shard/s327/sh/9788e96a-16c7-4246-8443-5ec7ec2236e3/4f5435ef231e04d61dfddb6270dbca79