updated to 25.06.2014