Satya - BugFixes

confirmed case validation cff