adapt to new stuff