Fsdss-586 Updated