multi-releases + code simplifications