format changes and Encrypt::uid() added