Added correct graphic generation