JavaConf commit 2