My changes as done earlier