EDIT BY J.BARAN 2007