Changed things a bit