Working fine now - thread locked