xml added
changed db to cached tables
cleanup better?