Updated to handle the Hollow Book