rename and better defaults