add imports
other conversation changes