incorporating feedback from JavaDays, Kiev