Did some scope design and resolving