removed certain ordering logic in discussed section