forgot to remove the duplicate code