reverting temporary testing changes in previous 2 commits