changes from jonathan about halfway done