Updates suggested by Nolan