some changes
merge develope into this