Synched with jaor's master geiser repo