Some more updates replacing generic content