Rearranged some things a little on scene8