List done. NEED to IMPROVE performance