DIY computation
fixed conflicts