fixed more with statements