Updated to use better params