Refactoring perse version