Removed thread.sleep until i can verify it is needed