More work on lib