Reshuffling code to add in SV tool