rename and slight tweeking