Made receive more modular