Updates and fix graph