Changes applied 10/30