devised added
some changes