HYPER: another big update, code change