Added func on library, removed some info not supposed to be pub