putting back the m_ updates that got deleted by juan's push on 12/5