added delayed jobs and also fixed streams