Ed's Changes to core functionality