adopted to new syntax