made some of the changes recommended by Bookis