make it safer