minor improvemnts moved setup into redesign to make it accessible via package