some changes
some changes by daniel