Changes for new 002 version