Updated Toolkit