Removing delay, adding diagnostics