updated and fixed content