Added a future improvement