Some changes in main and example