Changes after testing with live data