Replacing Johm with custom implementation
Fixed version 2.0-HF8