Some more changes added