fixing parameters to make more modular