Added scope, and comments