updated by eug 2009