Incorporated a few changes I'd made on orchestra