some minimal changes