back to work - make it working with latest versions of software