No scoping issues. Amended