added 2 commits that may be needed