E435: Reworked

Signed-off-by: Caio99BR <caiooliveirafarias0@gmail.com>