added fields (todo test)