MAJOR CHANGES: will send e-mail later to describe