Added some new stuff
Some part of s5_link