Major security and design update