Reconciled files from last prototype