added fields back in