begin update to 1.6, does not compile yet...