revised spoiler handling 3