Finishing up redesign