Orderings and some issues got gixed