Possible improvements
=====================