added graph and other