improve and remov S