This commit adds ordered functionality