Slightly safer hmm stuff, not that it helps