- merging changes from soysal