changing it around a bit