wip/swami/patches
