finished v1.1