Updated for v4.0.1
Updated to reflect recent tool updates for v4.0.1