Un-indent upgrade functions