engine improvment + stack state test (not finished)