Shore fix and Graph fix