new design almost done and working