Added other domain, fixed bugs with ordering