more code updated