Removed merge duplication issues. Still updated with map