More work on library