some little rework