Solving duplicating issues
Fixed duplicated lines
Removed point in roadmap due to lack of time