Added a null parameter to account for changes recently made