Added some changes
confision
Merge branch 'master' into testing
ok again