Added comment to remember to check for id