NYPD officials say the department plans on conducting a survey of undercover police officers in hopes of preventing future friendly fire incidents.

The survey is expected to be followed by training overseen by an outside consultant that will focus on confrontations between on-duty and off-duty officers. NYPD officials have been under pressure from the public after Omar Edwards, an off-duty police officer, was shot and killed by a fellow officer last week.

Police say Edwards was off-duty Thursday night when he chased a suspect he believed broke into his car. Police say NYPD officer Andrew Dunton shot Edwards, thinking he was the suspect.

A wake for Edwards will be held Tuesday from 4 p.m. to 8 p.m. at the Woodward Lawrence Funeral Home in Brooklyn. Edwards' funeral will be at 10 a.m. Thursday at the Church of Our Lady of Victory.