almost done #40