TK-117375 Updated the changes to better reflect Jorge's proposed design