Slight modifications after meeting with Tom