update s02 with help from forum