Updated to use new physics properly