changes after meeting - almost a revert