move modify/update into transaction handler as well