Reverted back to old impl