drop fatality measures and add s2

Signed-off-by: mienkoja <mienkoja@gmail.com>