Commit 04.23 Update