1.1.8 initial changes