some changes from devel