Ss customizations=)

merge customizations