updated for Tool Labs changes