fixed version with graphics