Code shown in final internal review

This commit has the code shown in the final internal review and is
working