Minor change + Integrity checking...