Half fixed however duplication bug has occured.