updated to 1.6 and different things