Sample data and few changes