Modified for web pages v1
Added all checks
Modified for personalization