John's changes merged in