Updated to work with new Shafter program