More updates implemented