Changes made from librry