[IMP] improved code as per suggestion for website_private