Technical updates

@technicalupdates