Just updating to 6_0 and not trying to split it up anymore