Final graphics fix push