updates after Kris' feedback