added thor impl
revised defib solution