Felipe Massa has called for improvements to be made to the medical infrastructure at the Monaco Grand Prix following his two accidents there last month.
The Brazilian raised the issue in the driver's meeting during the Canadian Grand Prix weekend.
He suffered a major crash at Ste Devote during qualifying after locking up under braking, with a similar accident during the race caused by a suspension failure.
"I had two crashes in Monaco and the organization and the situation there was really bad," he said. "It's a problem we have in Monaco, a problem we need to improve and I've already spoken to the doctors.
"In Monaco, everything that happened was not good -- the time I waited for the ambulance and, in the first crash, I had to walk 200 meters [to go] over the fence.
"I'm sure after everything that happened in Monaco, they will change their organization and their preparation."
Massa, who suffered another accident during qualifying for the Canadian Grand Prix yesterday, said that the set-up in Montreal was a big contrast to Monaco.
"Here, everything was perfect and working well," he said. "The doctor and the medical center were very well prepared and it was a big difference from here to Monaco."