Minimal changes on example program