added more exports and modifications