Updated for really new data layout of facdev