TODO update. Performance idea