added user condiitonal if nil or not