added in Gabriel's suggestions