Removed delays and added log collection