changes to make compatible with new params