E435: Changes based on p715

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