A few changes added