Adapt to stevengharris account