Revert "Revert "Updat for scrdst""

Let's try this