Made some changes to get it running on new machine