Updated church solution