pushed changes for Nolan