Latest sync with mvp spec