fixed graph and df