Refactoring and new sim