more rework, bug fix