changed to reflect some recent changes