delete debug message and add FIXME
add API Commit(not working)