still fixing graph