Update to current implementation