Gap fix + new evades