Changes made to be used as library file