Update my branch with changes

Update the branch