Improved working example