adapt #2