added all fields