added support for cleanse