Manually copied files from cmbennett