Added toolbox, removed nonsense code