Last try to rectify field changes and DB clashes