Refactored using command option l