Simplify shelter: always do strength and danger