some changes from deva