Seems to be working.
cleanup
looks like it really works now