many changes before 07-06-14