added Jake's stuff