added scope
addad default if conditions
added default if condition