restructured records
some changes