API and Web modified