added user condition