integrated changes into my version of galileo