More work on librifying