adding JY changes to get it running on docker container