more changes to replace ores