Added tutorial integration
Manual Merge fix