added fields
removed unused code