Added Saftey Measures

SAFER!