Commit with correctess check WIP