Made more modular & help