added the rest of the fields