now in backward-compatible version