Something changed!

Also other changes