Finally working fine

Check all working functionality