Updated init and toolbox