Update to 1.1, many changes