Modified to work with the newest version of Chrono