added some more code for feb20