rework a little more