Moved things around a bit to make it more standard.