resolved safety n time up bug. need to be tested.