improve intro, remove fun ext in S2