tuned up after rough merge