update 18.08.2014 after PAC merge