Changed it up a bit