some more changes added