Changed structure, fixed conflicts