redesign not implemented msg and some clean up