Before deleting second loop
Last tweaks