Minor modifications to what Bryce added