Refactoring and added first ore