Full update to 1.6.1