Some more changes for first version (scope testing)