more changes
removed some demo