made some minimal changes