fixed issues except delay issue