30_07 Updates

Updates and new files