Removed hard-coded parameters