Mentions works, some refactoring