added guard condition so have to have all fields now