Simple changes with latest libs to show it working.