updated to use new normal storage format