Restructuring, logging in mostly works