Customized some of the library parts