replaced unnecesary fields