Fix laura2
Refactoring