adding safety critical stuff