Trying to fix for new parameters