might have fixed duplication problem (DB is not working properly so can not test solution)