merge in s5's changes