adapt to new features