Overhauls to 002 and 005