checked in james' updates