-- Changed testing order