Fsdss-673 Updated -