modify job following Xav's review