restructuring prepared for static encryption