update from 10.07.14