committing working version for bawtry