Scope reworked a bit... testing needed :(