modified so it merges more cleanly with another branch