Merged Jeff's Changes