updated after major content upgrade
merged changes and re-commit