added legacy code (include expired version)