New changes added for initial version