Emnet's changes 11/30