Commit code to be submitted to Carl Nunn