works with latest docs