Made IDs more specific, moved #notes