[UPDATE] (general) Updated scoping