Improving performance

Improving performance - Second Proposal