Making the code prod ready again.