TO DO: Apply sort from Commodity sample - Change State