Commit version that worked for DOE demo