Finished fixing the delay problem