redesign looks + code paths