updated stuff Friday 545pm