added some comments about table name changes and duplicate identities
refactored is locked out