huge tedious commit without explanations