Refactored to lower payload