merge from Kris's additions