updates after dumb merge from yesterday