Some internal updates work