code rework, hmm... seems ok... yeah...