More updates

More code updates