Altered some things in prep for next stage