Improvements approach and design.

Based on review comments.