Made more modificaitons.