Updated To handle book