Rework simple examples