Changes due to issues accessing params