improved naming and examples