More code updated