HomeSafety needs checking