Refactored into book partial