Makes requestId an option and passes it correctly to the sub functions