redesign

Signed-off-by: thiagofelix <felixthi@gmail.com>