- Initial implementation, backwards-incompatible