Working on better enelarged image
fixed conflicts