Close #32
Close #33
Close 34
Close #35