added safty net