Temp removal of userid match
added todo