Changes to support new arguments

NOT YET TESTING THOUGH