added scope
added validation