changes moved from maintenance to fit library