Changed things around a bit