Rework without graphics