Dominic's changes to library header