Extracted John's changed PROPERLY