added subject
more testing, cleanup done