fixed jeremy stuff