some changes to syrian code and some fixing