almost done with 3.1