hopefully final updates