Make it safer