added fields, removed obsolete listener
"