Added blocking
removed autopause
fixed merge