updates after working with Chris