Created by: aileenrose
also hoping to fix the 'slice index out of range error' which is causing builds to fail.
