The final form and fixes