Apply design from #246
Apply design from #246