vigane refactoring 1