v1.1 with minor improvements