Refactored behaviour (Not overwriting if no args given)