reverting back to original setup to keep everything stable until Jim edits