Continued with some 1.8 updating