Latest changes from Jason and John