added some safety rules