Done refactoring and added asking