Polished solution...