some changes scope is commented out