Added sorting and numbers back