removed tested code
Add demoable version with all points