committing some preliminary changes