Made more changes. Final details.