BoN changes for SafeTown