updates based on lucien and alex's feedback