changed data members to match project specifications