restructuring
calcs