Changed it around a bit