added graph & grid