Modified for Mass Update