work on compatibility for all versions