Time To Up Grade and Make Safe