More updates to the code