Marlene Pinnock, the woman whose brutal beating at the hands of a California Highway Patrol officer was captured on video in July of this year, will receive a $1.5 million settlement in a deal reached this week, the Associated Press reports. The officer will resign.

According to the AP, much of the money will go to a special needs trust for Pinnock, who has bipolar disorder. Caree Harper, her attorney, stated she was satisfied with the outcome:

"One of the things we wanted to make sure of was that she was provided for in a manner that accommodated her unique situation in life," Harper said, "and that the officer was not going to be an officer anymore and we secured those things."

Daniel Andrew, the officer seen punching Pinnock, has been on leave since the beating, and has "elected to resign," according to the CHP's statement. He may face criminal charges.