Adapting to new doc