Fixed up logic
Fixed up ordering but it is not completing