add in waiting for safety