Update tag cassing and push updated guard clause draft