Might not need this parameter hack anymore