Bringing in new changes from ReelBlink