Updated from g6dev01