More test cases and working smoother now