I want to discuss a few things with Luigi on Monday and then if he is 100% happy with the new version I will remove the old code