Diana commit 2