more changes, but with a big error now!