Rework variable output