pulling in changes from edtrac