#68 #69 resolvidos