Changed to 1.7
Some changes