changes for working rob@work 3 demo