Extracted method, now more modular