Final testing changes_2