Reverted back to original approach