update to reflect latest changes