make whole project 5.2 friendly