fixed jeremy stuff pt t2