added fields, yet unfunctional