changes from client 24.10.2014