changed it around a bit