commit before changing configuration
Added sorting