Adde few minor modifications...