Changed the broken code for staging