A few changes here and there to the arrangement