Final graph changes before expo