Improved. No more additional lists