Preliminary 1.6 update. Change further as needed.