FINAL 1.9, testing now before merge