* structure changed, now hopefully jänli is happy