Reverted back until weekend issue is solved