restructuring; new problem solved