more implementatio, working on SS part