Christina/discard changes revised