Update for escapist's format change