finished 1.1

finished 1.1