new update

Implementations changes according to latest discussion