making my code safe
Final COMPLETED!