changes from r9