updated to reflect logshifter changes and other changes