cleaned up and added export