Ugh a few changes