By the end of 2004  almost all provisions of the August 2001 Framework Peace Agreement (known as the Ohrid Agreement)  which ended the 2001 armed conflict between ethnic Albanian insurgents and Macedonian government forces  had been implemented