completely removed 'uid' requirement