Applying KL's ninja update