1.6.2 - more changes