Replaced dummy data and other small changes