big commit, did many tests