Changed structure for task1.