remove some hardcodings, implement check for already encrypted