Reverted back to original working one