add timeout and logging
remove json