Example improvements