Attorneys for the city of Portland appear to have reached a tentative contract agreement with the Portland Police Association.

The agreement, which was released Tuesday, comes after more than a year of negotiations and is still pending final approval from each side. It covers officer salaries, bonuses for employee retention and a compromise on expanding Portland Street Response. It also includes the police bureau’s discipline guide as well as references to a new community oversight board, Oregon Public Broadcasting reports.

The previous contract technically ran through June 2020, but negotiations were paused due to the pandemic and the protests and riots.