Changed to adapt to TheBookShare Client