added retries, JIT communication for no-prefecth etc