2nd attempt to solve inconsistnecies