+removed unnecessary fields