Modified each api