more changes, to stay convenient