VP-79 Refactored: moved to API