Changed around a couple of things