Reverted back old code