More updates as suggested by Miguel