Ordenes Fixed Some Bugs