graphs added and clean up