made system more robust