added jims changes for real this time