Added new graph and refactored old one