new fixes and replacement configs