Forked version of Carrie's file demo edit