#41 Added sorting as it was before