some changes

ready for the demo