update to 1.3
update to v1.6
merge?