extra code amendments while waiting for encryption