Add John, refactor