Major update to 1.7