hmm features added , re org