New software updates for Dmitry
merged with local changes