GPII-120 Making changes based on github comments from antranig