many changes to v1.1.6