BF try to add some order to the repository