Added 12/10 changes