Fixes #1 - Creates Duplicate Entries