Merge Max's Graphics bits