Refactored to unrequred parameter