updates from 25.11.14