Modified version of hawtjni